From f4074e8265e6f33e755c64d5a88ed21ec69293c6 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Sun, 12 Aug 2007 17:29:46 +0000 Subject: [PATCH] * ocaml-source: install ocaml tarball as /usr/src/ocaml-source-VERSION.tar.bz2; the "-source" part was erroneously missing and make other packages FTBFS * bump debhelper dependencies and compatibility level to 5 --- debian/changelog | 8 ++++++-- debian/compat | 2 +- debian/control | 2 +- debian/ocaml-source.install.in | 2 +- debian/rules | 9 +++++---- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index ff9ff370..a0fbb804 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ocaml (3.10.0-5) UNRELEASED; urgency=low +ocaml (3.10.0-5) experimental; urgency=low [ Ralf Treinen ] * ocaml-mode.emacsen-install: do not hardcode the emacs flavours for which @@ -8,8 +8,12 @@ ocaml (3.10.0-5) UNRELEASED; urgency=low [ Stefano Zacchiroli ] * add patch arm_ccheckbound_typo, fix a typing error typo which makes ocaml FTBFS on arm + * ocaml-source: install ocaml tarball as + /usr/src/ocaml-source-VERSION.tar.bz2; the "-source" part was erroneously + missing and make other packages FTBFS + * bump debhelper dependencies and compatibility level to 5 - -- Stefano Zacchiroli Wed, 25 Jul 2007 17:52:23 +0200 + -- Stefano Zacchiroli Sun, 12 Aug 2007 19:29:07 +0200 ocaml (3.10.0-4) experimental; urgency=low diff --git a/debian/compat b/debian/compat index b8626c4c..7ed6ff82 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 83b74a9c..adb6ba63 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Sven Luther , Stefano Zacchiroli , Julien Cristau , Samuel Mimram -Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils +Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/ diff --git a/debian/ocaml-source.install.in b/debian/ocaml-source.install.in index d50e30c0..59039b90 100644 --- a/debian/ocaml-source.install.in +++ b/debian/ocaml-source.install.in @@ -1 +1 @@ -debian/ocaml-#OcamlABI#.tar.bz2 /usr/src/ +debian/ocaml-source-#OcamlABI#.tar.bz2 /usr/src/ diff --git a/debian/rules b/debian/rules index f4db989f..0d7131c2 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ INSTDIR = $(CURDIR)/debian/ocaml-nox/usr NATIVE_ARCHS = $(shell cat debian/native-archs) DISTDIR = $(PACKAGE)-$(OCAMLMAJOR).$(OCAMLMINOR) +SRCTARBALL = $(PACKAGE)-source-$(OCAMLMAJOR).$(OCAMLMINOR).tar.bz2 # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -52,11 +53,11 @@ abi-sed-clean: debian/control: sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in > $@ -pre-config: debian/$(DISTDIR).tar.bz2 +pre-config: debian/$(SRCTARBALL) touch $@ -debian/$(DISTDIR).tar.bz2: +debian/$(SRCTARBALL): ln -fs . $(DISTDIR) # beware of the symlink recursion! - tar --anchored -chjf debian/$(DISTDIR).tar.bz2 \ + tar --anchored -chjf $@ \ --exclude=$(DISTDIR)/$(DISTDIR) \ --exclude-from=debian/ocaml-source.exclude \ $(DISTDIR)/ @@ -139,7 +140,7 @@ endif dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh debian/rules abi-sed-clean - rm -f debian/$(DISTDIR).tar.bz2 + rm -f debian/$(SRCTARBALL) install: install-indep install-arch install-indep: build-indep -- 2.30.2